Skip to content

Commit 1d7be2d

Browse files
committed
Move files
1 parent 42cb45b commit 1d7be2d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+56
-56
lines changed

web/compress.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def compressVideo(vidPath):
7070
cv2.destroyAllWindows()
7171

7272
clearDirectory('Compressed/')
73-
rootdir = 'ImagesAndVideos/'
73+
rootdir = 'resources/'
7474

7575
for subdir, dirs, files in os.walk(rootdir):
7676
for file in files:
@@ -80,6 +80,6 @@ def compressVideo(vidPath):
8080
elif os.path.join(subdir, file).endswith(".mp4"):
8181
compressVideo(os.path.join(subdir, file))
8282
else:
83-
print("What the fuck")
83+
print("Sad days")
8484

8585
print("Done")

web/index.html

+54-54
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ <h1>MASLAB Team 5</h1>
9797
</p>
9898
<div class="timeline__item-media">
9999
<video width="100%" height="auto" autoplay muted loop>
100-
<source src="ImagesAndVideos/Dec_19/WheelAssembly.mp4">
100+
<source src="resources/Dec_19/WheelAssembly.mp4">
101101
</div>
102102
</div>
103103
</div>
@@ -141,9 +141,9 @@ <h1>MASLAB Team 5</h1>
141141
The first iteration of the robot base is made, and the new wheel assembly design is tested.
142142
</p>
143143
<div class="timeline__item-media" display="flex">
144-
<img loading="lazy" width="49%" src = "ImagesAndVideos/Dec_22/Base.png">
144+
<img loading="lazy" width="49%" src = "resources/Dec_22/Base.png">
145145
<video width="49%" autoplay muted loop>
146-
<source src="ImagesAndVideos/Dec_22/WheelAssemblyTest.mp4">
146+
<source src="resources/Dec_22/WheelAssemblyTest.mp4">
147147
</video>
148148
</div>
149149
</div>
@@ -190,12 +190,12 @@ <h1>MASLAB Team 5</h1>
190190
<div class="timeline__item-media">
191191
<div class="row">
192192
<div class="column">
193-
<img loading="lazy" src="ImagesAndVideos/Dec_23-25/BearingMount.png">
194-
<img loading="lazy" src="ImagesAndVideos/Dec_23-25/CurvyMount.png">
195-
<img loading="lazy" src="ImagesAndVideos/Dec_23-25/Blocks.png">
193+
<img loading="lazy" src="resources/Dec_23-25/BearingMount.png">
194+
<img loading="lazy" src="resources/Dec_23-25/CurvyMount.png">
195+
<img loading="lazy" src="resources/Dec_23-25/Blocks.png">
196196
</div>
197197
<div class="column">
198-
<img loading="lazy" src="ImagesAndVideos/Dec_23-25/Variables.png">
198+
<img loading="lazy" src="resources/Dec_23-25/Variables.png">
199199
</div>
200200
</div>
201201
</div>
@@ -241,9 +241,9 @@ <h1>MASLAB Team 5</h1>
241241
The gate mechanism is made and animated in OnShape.
242242
</p>
243243
<div class="timeline__item-media">
244-
<img loading="lazy" width="49%" src="ImagesAndVideos/Dec_27/Gate.png">
244+
<img loading="lazy" width="49%" src="resources/Dec_27/Gate.png">
245245
<video width="49%" autoplay muted loop>
246-
<source src="ImagesAndVideos/Dec_27/GateAnimated.mp4">
246+
<source src="resources/Dec_27/GateAnimated.mp4">
247247
</video>
248248
</div>
249249
</div>
@@ -290,12 +290,12 @@ <h1>MASLAB Team 5</h1>
290290
<div class="timeline__item-media">
291291
<div class="row">
292292
<div class="column">
293-
<img loading="lazy" src="ImagesAndVideos/Dec_27-31/RoughDraft.png">
293+
<img loading="lazy" src="resources/Dec_27-31/RoughDraft.png">
294294
</div>
295295
<div class="column">
296-
<img loading="lazy" src="ImagesAndVideos/Dec_27-31/Altium.png">
296+
<img loading="lazy" src="resources/Dec_27-31/Altium.png">
297297
<video autoplay muted loop>
298-
<source src="ImagesAndVideos/Dec_27-31/Draft.mp4">
298+
<source src="resources/Dec_27-31/Draft.mp4">
299299
</video>
300300
</div>
301301
</div>
@@ -342,8 +342,8 @@ <h1>MASLAB Team 5</h1>
342342
The peripherals are configured, and the pins are assigned.
343343
</p>
344344
<div class="timeline__item-media">
345-
<img loading="lazy" width=49% src="ImagesAndVideos/Jan_1-2/Peripherals.png">
346-
<img loading="lazy" width=49% src="ImagesAndVideos/Jan_1-2/Schematic.png">
345+
<img loading="lazy" width=49% src="resources/Jan_1-2/Peripherals.png">
346+
<img loading="lazy" width=49% src="resources/Jan_1-2/Schematic.png">
347347
</div>
348348
</div>
349349
</div>
@@ -389,12 +389,12 @@ <h1>MASLAB Team 5</h1>
389389
<div class="timeline__item-media">
390390
<div class="row">
391391
<div class="column">
392-
<img loading="lazy" src="ImagesAndVideos/Jan_2-4/Placement.png">
393-
<img loading="lazy" src="ImagesAndVideos/Jan_2-4/3DDraft.png">
392+
<img loading="lazy" src="resources/Jan_2-4/Placement.png">
393+
<img loading="lazy" src="resources/Jan_2-4/3DDraft.png">
394394
</div>
395395
<div class="column">
396-
<img loading="lazy" src="ImagesAndVideos/Jan_2-4/Final.png">
397-
<img loading="lazy" src="ImagesAndVideos/Jan_2-4/Render.png">
396+
<img loading="lazy" src="resources/Jan_2-4/Final.png">
397+
<img loading="lazy" src="resources/Jan_2-4/Render.png">
398398
</div>
399399
</div>
400400
</div>
@@ -482,7 +482,7 @@ <h1>MASLAB Team 5</h1>
482482
</p>
483483
<div class="timeline__item-media">
484484
<video width="100%" autoplay muted loop>
485-
<source src="ImagesAndVideos/Jan_7/STM32CubeIDE.mp4">
485+
<source src="resources/Jan_7/STM32CubeIDE.mp4">
486486
</video>
487487
</div>
488488
</div>
@@ -527,8 +527,8 @@ <h1>MASLAB Team 5</h1>
527527
The official start of MASLAB. Additional parts are created using CAD, and we start working with OpenCV after connecting the NUC to a monitor.
528528
</p>
529529
<div class="timeline__item-media">
530-
<img loading="lazy" width="49%" src="ImagesAndVideos/Jan_8/BoundingRect.png">
531-
<img loading="lazy" width="49%" src="ImagesAndVideos/Jan_8/TwoLines.png">
530+
<img loading="lazy" width="49%" src="resources/Jan_8/BoundingRect.png">
531+
<img loading="lazy" width="49%" src="resources/Jan_8/TwoLines.png">
532532
</div>
533533
</div>
534534
</div>
@@ -575,12 +575,12 @@ <h1>MASLAB Team 5</h1>
575575
<div class="row">
576576
<div class="column">
577577
<video autoplay muted loop>
578-
<source src="ImagesAndVideos/Jan_9/Timelapse.mp4">
578+
<source src="resources/Jan_9/Timelapse.mp4">
579579
</video>
580-
<img loading="lazy" src="ImagesAndVideos/Jan_9/3DPrint.png">
580+
<img loading="lazy" src="resources/Jan_9/3DPrint.png">
581581
</div>
582582
<div class="column">
583-
<img loading="lazy" src="ImagesAndVideos/Jan_9/Chute.png">
583+
<img loading="lazy" src="resources/Jan_9/Chute.png">
584584
</div>
585585
</div>
586586
</div>
@@ -628,12 +628,12 @@ <h1>MASLAB Team 5</h1>
628628
<div class="timeline__item-media">
629629
<div class="row">
630630
<div class="column">
631-
<img loading="lazy" src="ImagesAndVideos/Jan_10/LiftCAD.png">
632-
<img loading="lazy" src="ImagesAndVideos/Jan_10/PCB.png">
631+
<img loading="lazy" src="resources/Jan_10/LiftCAD.png">
632+
<img loading="lazy" src="resources/Jan_10/PCB.png">
633633
</div>
634634
<div class="column">
635635
<video autoplay muted loop>
636-
<source src="ImagesAndVideos/Jan_10/LiftVideo.mp4">
636+
<source src="resources/Jan_10/LiftVideo.mp4">
637637
</video>
638638
</div>
639639
</div>
@@ -683,12 +683,12 @@ <h1>MASLAB Team 5</h1>
683683
<div class="row">
684684
<div class="column">
685685
<video autoplay muted loop>
686-
<source src="ImagesAndVideos/Jan_11/PCBTest.mp4">
686+
<source src="resources/Jan_11/PCBTest.mp4">
687687
</video>
688-
<img loading="lazy" src="ImagesAndVideos/Jan_11/Laser.png">
688+
<img loading="lazy" src="resources/Jan_11/Laser.png">
689689
</div>
690690
<div class="column">
691-
<img loading="lazy" src="ImagesAndVideos/Jan_11/HSV.png">
691+
<img loading="lazy" src="resources/Jan_11/HSV.png">
692692
</div>
693693
</div>
694694
</div>
@@ -736,15 +736,15 @@ <h1>MASLAB Team 5</h1>
736736
<div class="timeline__item-media">
737737
<div class="row">
738738
<div class="column">
739-
<img loading="lazy" src="ImagesAndVideos/Jan_14/Assembling.png">
740-
<img loading="lazy" src="ImagesAndVideos/Jan_14/Assembled.png">
739+
<img loading="lazy" src="resources/Jan_14/Assembling.png">
740+
<img loading="lazy" src="resources/Jan_14/Assembled.png">
741741
</div>
742742
<div class="column">
743743
<video autoplay muted loop>
744-
<source src="ImagesAndVideos/Jan_14/Printing.mp4">
744+
<source src="resources/Jan_14/Printing.mp4">
745745
</video>
746746
<video autoplay muted loop>
747-
<source src="ImagesAndVideos/Jan_14/Lift.mp4">
747+
<source src="resources/Jan_14/Lift.mp4">
748748
</video>
749749
</div>
750750
</div>
@@ -794,12 +794,12 @@ <h1>MASLAB Team 5</h1>
794794
<div class="row">
795795
<div class="column">
796796
<video autoplay muted loop>
797-
<source src="ImagesAndVideos/Jan_15-16/Gate.mp4">
797+
<source src="resources/Jan_15-16/Gate.mp4">
798798
</video>
799-
<img loading="lazy" src="ImagesAndVideos/Jan_15-16/Camera.png">
799+
<img loading="lazy" src="resources/Jan_15-16/Camera.png">
800800
</div>
801801
<div class="column">
802-
<img loading="lazy" src="ImagesAndVideos/Jan_15-16/Test.png">
802+
<img loading="lazy" src="resources/Jan_15-16/Test.png">
803803
</div>
804804
</div>
805805
</div>
@@ -847,14 +847,14 @@ <h1>MASLAB Team 5</h1>
847847
<div class="timeline__item-media">
848848
<div class="row">
849849
<div class="column">
850-
<img loading="lazy" src="ImagesAndVideos/Jan_18/MiguelAndy.png">
850+
<img loading="lazy" src="resources/Jan_18/MiguelAndy.png">
851851
<video autoplay muted loop>
852-
<source src="ImagesAndVideos/Jan_18/Camera.mp4">
852+
<source src="resources/Jan_18/Camera.mp4">
853853
</video>
854854
</div>
855855
<div class="column">
856-
<img loading="lazy" src="ImagesAndVideos/Jan_18/DoubleStack.png">
857-
<img loading="lazy" src="ImagesAndVideos/Jan_18/Anshul.png">
856+
<img loading="lazy" src="resources/Jan_18/DoubleStack.png">
857+
<img loading="lazy" src="resources/Jan_18/Anshul.png">
858858
</div>
859859
</div>
860860
</div>
@@ -902,12 +902,12 @@ <h1>MASLAB Team 5</h1>
902902
<div class="timeline__item-media">
903903
<div class="row">
904904
<div class="column">
905-
<img loading="lazy" src="ImagesAndVideos/Jan_22/OhNo.png">
906-
<img loading="lazy" src="ImagesAndVideos/Jan_22/Print.png">
905+
<img loading="lazy" src="resources/Jan_22/OhNo.png">
906+
<img loading="lazy" src="resources/Jan_22/Print.png">
907907
</div>
908908
<div class="column">
909909
<video autoplay muted loop>
910-
<source src="ImagesAndVideos/Jan_22/BlockLifter.mp4">
910+
<source src="resources/Jan_22/BlockLifter.mp4">
911911
</video>
912912
</div>
913913
</div>
@@ -955,9 +955,9 @@ <h1>MASLAB Team 5</h1>
955955
</p>
956956
<div class="timeline__item-media">
957957
<video width="49%" autoplay muted loop>
958-
<source src="ImagesAndVideos/Jan_23/Sorting.mp4">
958+
<source src="resources/Jan_23/Sorting.mp4">
959959
</video>
960-
<img loading="lazy" width="49%" src="ImagesAndVideos/Jan_23/C.png">
960+
<img loading="lazy" width="49%" src="resources/Jan_23/C.png">
961961
</div>
962962
</div>
963963
</div>
@@ -1002,10 +1002,10 @@ <h1>MASLAB Team 5</h1>
10021002
</p>
10031003
<div class="timeline__item-media">
10041004
<video width="49%" autoplay muted loop>
1005-
<source src="ImagesAndVideos/Jan_24/ClampBlocks.mp4">
1005+
<source src="resources/Jan_24/ClampBlocks.mp4">
10061006
</video>
10071007
<video width="49%" autoplay muted loop>
1008-
<source src="ImagesAndVideos/Jan_24/FollowBlocks.mp4">
1008+
<source src="resources/Jan_24/FollowBlocks.mp4">
10091009
</video>
10101010
</div>
10111011
</div>
@@ -1053,18 +1053,18 @@ <h1>MASLAB Team 5</h1>
10531053
<div class="row">
10541054
<div class="column">
10551055
<video autoplay muted loop>
1056-
<source src="ImagesAndVideos/Jan_25-30/Lift.mp4">
1056+
<source src="resources/Jan_25-30/Lift.mp4">
10571057
</video>
10581058
<video autoplay muted loop>
1059-
<source src="ImagesAndVideos/Jan_25-30/Release.mp4">
1059+
<source src="resources/Jan_25-30/Release.mp4">
10601060
</video>
10611061
</div>
10621062
<div class="column">
10631063
<video autoplay muted loop>
1064-
<source src="ImagesAndVideos/Jan_25-30/Gyroscope.mp4">
1064+
<source src="resources/Jan_25-30/Gyroscope.mp4">
10651065
</video>
10661066
<video autoplay muted loop>
1067-
<source src="ImagesAndVideos/Jan_25-30/PlatformRelease.mp4">
1067+
<source src="resources/Jan_25-30/PlatformRelease.mp4">
10681068
</video>
10691069
</div>
10701070
</div>
@@ -1112,10 +1112,10 @@ <h1>MASLAB Team 5</h1>
11121112
</p>
11131113
<div class="timeline__item-media">
11141114
<video width="49%" autoplay muted loop>
1115-
<source src="ImagesAndVideos/Jan_31-Feb_1/LiftProcedure.mp4">
1115+
<source src="resources/Jan_31-Feb_1/LiftProcedure.mp4">
11161116
</video>
11171117
<video width="49%" autoplay muted loop>
1118-
<source src="ImagesAndVideos/Jan_31-Feb_1/NewLifter.mp4">
1118+
<source src="resources/Jan_31-Feb_1/NewLifter.mp4">
11191119
</video>
11201120
</div>
11211121
</div>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)