From da49b9fa97cd0b9e666c0a99706bf2e4b4ec7e98 Mon Sep 17 00:00:00 2001 From: adamakh01 Date: Thu, 28 Aug 2025 14:59:02 -0700 Subject: [PATCH 1/6] cleaned up styling code (merged it with html files) --- announcements.html | 53 +++++++++++++++++++++++++++++++-- events.html | 52 +++++++++++++++++++++++++++++++- index.html | 23 ++++++++++++++ officers.html | 61 +++++++++++++++++++++++++++++++++++++- styleAnnouncementEvent.css | 47 ----------------------------- styleIndex.css | 21 ------------- styleOfficer.css | 57 ----------------------------------- 7 files changed, 185 insertions(+), 129 deletions(-) delete mode 100644 styleAnnouncementEvent.css delete mode 100644 styleIndex.css delete mode 100644 styleOfficer.css diff --git a/announcements.html b/announcements.html index 6bb7eb7..9b755ab 100644 --- a/announcements.html +++ b/announcements.html @@ -4,7 +4,6 @@ - Announcements Demo Page @@ -42,4 +41,54 @@

Announcement 6

Welcome to Announcements :D

Choose an announcement on the left!

- \ No newline at end of file + + \ No newline at end of file diff --git a/events.html b/events.html index 6bf7181..29a0f36 100644 --- a/events.html +++ b/events.html @@ -42,4 +42,54 @@

Event 6

Welcome to Events :D

Choose an event on the left!

- \ No newline at end of file + + \ No newline at end of file diff --git a/index.html b/index.html index 4e83eb9..0e60fe3 100644 --- a/index.html +++ b/index.html @@ -26,3 +26,26 @@

Events

+ \ No newline at end of file diff --git a/officers.html b/officers.html index 102fb37..1b8f2d6 100644 --- a/officers.html +++ b/officers.html @@ -76,4 +76,63 @@

Unknown Person

- \ No newline at end of file + + \ No newline at end of file diff --git a/styleAnnouncementEvent.css b/styleAnnouncementEvent.css deleted file mode 100644 index 71602f3..0000000 --- a/styleAnnouncementEvent.css +++ /dev/null @@ -1,47 +0,0 @@ -body{ - margin: 0; -} -.featureBtn{ - background-color: white; - position:relative; - left:120px -} -.btn{ - display:block; - width:700px; - height:100px; - margin:auto; - border-color:black; - border-style: solid; - background-color: white; -} -div{ - position:relative; - left:120px; - top:30px; - overflow-y: auto; - height: 500px; - width: 725px; - border-color:black; - border-style:solid; - background-color: white; -} -h1{ - font-size: 45px; - font-family: Arial, Helvetica, sans-serif; - background-color: lightgray; - text-align: center; - padding: 20px; - border-style: solid; -} -section{ - position:absolute; - left:1000px; - top:190px; - height: 500px; - width: 725px; - border-color:black; - border-style:solid; - background-color: white; - padding:20px; -} diff --git a/styleIndex.css b/styleIndex.css deleted file mode 100644 index 0dc0c77..0000000 --- a/styleIndex.css +++ /dev/null @@ -1,21 +0,0 @@ -body{ - margin: 0; -} -h1{ - font-size: 45px; - font-family: Arial, Helvetica, sans-serif; - background-color: lightgray; - text-align: center; - padding: 20px; - border-color:black; - border-style: solid; -} -.btn{ - display:block; - width:400px; - height:200px; - margin:auto; - border-color:black; - border-style: solid; - background-color: white; -} \ No newline at end of file diff --git a/styleOfficer.css b/styleOfficer.css deleted file mode 100644 index 8162861..0000000 --- a/styleOfficer.css +++ /dev/null @@ -1,57 +0,0 @@ -body{ - margin: 0; -} -.feature{ - display:block; - width: 400px; - position:relative; -} -.featureBtn{ - background-color: white; - position:relative; - left:5px; -} -h1{ - font-size: 45px; - font-family: Arial, Helvetica, sans-serif; - background-color: lightgray; - text-align: center; - padding: 20px; - border-color:black; - border-style: solid; -} -h2{ - font-size: 20px; - font-family: Arial, Helvetica, sans-serif; - padding: 20px; -} -.btn{ - position: relative; - left:120px; - width:400px; - height:200px; - margin:auto; - border-color:black; - border-style: solid; - background-color: white; -} - -div{ - width:900px; - height:450; - margin:auto; - border-color:black; - border-style: solid; - background-color: white; - padding:20px; -} -h3{ - display:inline-block; - right:120px; -} -p{ - white-space: pre; -} -img { - float:left; -} \ No newline at end of file From 67bd980a881ccbbc35f8c1dea6e13d69148f00f2 Mon Sep 17 00:00:00 2001 From: adamakh01 Date: Fri, 29 Aug 2025 15:38:29 -0700 Subject: [PATCH 2/6] created add forms --- addOfficerForm.html | 0 announcmentAddForm.html | 6 ++++++ eventAddForm.html | 0 3 files changed, 6 insertions(+) create mode 100644 addOfficerForm.html create mode 100644 announcmentAddForm.html create mode 100644 eventAddForm.html diff --git a/addOfficerForm.html b/addOfficerForm.html new file mode 100644 index 0000000..e69de29 diff --git a/announcmentAddForm.html b/announcmentAddForm.html new file mode 100644 index 0000000..26d5606 --- /dev/null +++ b/announcmentAddForm.html @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/eventAddForm.html b/eventAddForm.html new file mode 100644 index 0000000..e69de29 From 128ef32321e634b43a3069e3765e2de5cb1bc3dd Mon Sep 17 00:00:00 2001 From: AdamHo2028 Date: Sat, 30 Aug 2025 23:39:03 -0700 Subject: [PATCH 3/6] added date so I don't forget lol --- addOfficerForm.html | 85 +++++++++++++++++++++++++++++++++++++++++ announcmentAddForm.html | 84 ++++++++++++++++++++++++++++++++++++++-- eventAddForm.html | 82 +++++++++++++++++++++++++++++++++++++++ events.html | 5 +++ 4 files changed, 252 insertions(+), 4 deletions(-) diff --git a/addOfficerForm.html b/addOfficerForm.html index e69de29..46be4c3 100644 --- a/addOfficerForm.html +++ b/addOfficerForm.html @@ -0,0 +1,85 @@ + + + + + + + + Add Events + + +

Add Officer

+

Please enter the required information here.

+
+

Name

+ +
+
+

Info

+ +
+
+

Profile Image

+
+
+ + + + +
+ + \ No newline at end of file diff --git a/announcmentAddForm.html b/announcmentAddForm.html index 26d5606..4d86380 100644 --- a/announcmentAddForm.html +++ b/announcmentAddForm.html @@ -1,6 +1,82 @@ - - - + + + + + + + + Add Announcement + + +

Add Events

+

Please enter the required information here.

+
+

Title

+ +
+
+

Main Text

+ +
+
+ + + + +
+ \ No newline at end of file diff --git a/eventAddForm.html b/eventAddForm.html index e69de29..f320e11 100644 --- a/eventAddForm.html +++ b/eventAddForm.html @@ -0,0 +1,82 @@ + + + + + + + + Add Events + + +

Add Events

+

Please enter the required information here.

+
+

Title

+ +
+
+

Main Text

+ +
+
+ + + + +
+ + \ No newline at end of file diff --git a/events.html b/events.html index 29a0f36..e94cbc6 100644 --- a/events.html +++ b/events.html @@ -40,6 +40,7 @@

Event 6

Welcome to Events :D

+

When? : N/A

Choose an event on the left!

@@ -80,6 +81,10 @@

Welcome to Events :D

padding: 20px; border-style: solid; } + h3{ + font-size:25px; + font-style:italic; + } section{ position:absolute; left:1000px; From 52924808361d9d2bbafdbb7d24ace9a5b7cab422 Mon Sep 17 00:00:00 2001 From: AdamHo2028 Date: Sat, 30 Aug 2025 23:40:12 -0700 Subject: [PATCH 4/6] Revert "added date so I don't forget lol" This reverts commit 128ef32321e634b43a3069e3765e2de5cb1bc3dd. --- addOfficerForm.html | 85 ----------------------------------------- announcmentAddForm.html | 84 ++-------------------------------------- eventAddForm.html | 82 --------------------------------------- events.html | 5 --- 4 files changed, 4 insertions(+), 252 deletions(-) diff --git a/addOfficerForm.html b/addOfficerForm.html index 46be4c3..e69de29 100644 --- a/addOfficerForm.html +++ b/addOfficerForm.html @@ -1,85 +0,0 @@ - - - - - - - - Add Events - - -

Add Officer

-

Please enter the required information here.

-
-

Name

- -
-
-

Info

- -
-
-

Profile Image

-
-
- - - - -
- - \ No newline at end of file diff --git a/announcmentAddForm.html b/announcmentAddForm.html index 4d86380..26d5606 100644 --- a/announcmentAddForm.html +++ b/announcmentAddForm.html @@ -1,82 +1,6 @@ - - - - - - - - Add Announcement - - -

Add Events

-

Please enter the required information here.

-
-

Title

- -
-
-

Main Text

- -
-
- - - - -
- + + + \ No newline at end of file diff --git a/eventAddForm.html b/eventAddForm.html index f320e11..e69de29 100644 --- a/eventAddForm.html +++ b/eventAddForm.html @@ -1,82 +0,0 @@ - - - - - - - - Add Events - - -

Add Events

-

Please enter the required information here.

-
-

Title

- -
-
-

Main Text

- -
-
- - - - -
- - \ No newline at end of file diff --git a/events.html b/events.html index e94cbc6..29a0f36 100644 --- a/events.html +++ b/events.html @@ -40,7 +40,6 @@

Event 6

Welcome to Events :D

-

When? : N/A

Choose an event on the left!

@@ -81,10 +80,6 @@

When? : N/A

padding: 20px; border-style: solid; } - h3{ - font-size:25px; - font-style:italic; - } section{ position:absolute; left:1000px; From df602d7229c1f0f3b27d89da4d74803a750372e6 Mon Sep 17 00:00:00 2001 From: AdamHo2028 Date: Sat, 30 Aug 2025 23:43:35 -0700 Subject: [PATCH 5/6] added date so I don't forget lol --- events.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/events.html b/events.html index 29a0f36..e94cbc6 100644 --- a/events.html +++ b/events.html @@ -40,6 +40,7 @@

Event 6

Welcome to Events :D

+

When? : N/A

Choose an event on the left!

@@ -80,6 +81,10 @@

Welcome to Events :D

padding: 20px; border-style: solid; } + h3{ + font-size:25px; + font-style:italic; + } section{ position:absolute; left:1000px; From ae18fc63dd29ed6cb6ea0517cc47403dad16341a Mon Sep 17 00:00:00 2001 From: AdamHo2028 Date: Sat, 30 Aug 2025 23:56:04 -0700 Subject: [PATCH 6/6] added forms for all services --- addOfficerForm.html | 98 ++++++++++++++++++++++++++++++++++++++++ announcementAddForm.html | 82 +++++++++++++++++++++++++++++++++ announcements.html | 8 ++-- announcmentAddForm.html | 6 --- eventAddForm.html | 82 +++++++++++++++++++++++++++++++++ events.html | 8 ++-- officers.html | 8 ++-- 7 files changed, 277 insertions(+), 15 deletions(-) create mode 100644 announcementAddForm.html delete mode 100644 announcmentAddForm.html diff --git a/addOfficerForm.html b/addOfficerForm.html index e69de29..ab03b42 100644 --- a/addOfficerForm.html +++ b/addOfficerForm.html @@ -0,0 +1,98 @@ + + + + + + + + Add Events + + +

Add Officer

+

Please enter the required information here.

+
+

Name

+ +
+
+

Info

+ +
+
+

Profile Image

+ User Pfp + +
+
+ + + + +
+ + \ No newline at end of file diff --git a/announcementAddForm.html b/announcementAddForm.html new file mode 100644 index 0000000..2376054 --- /dev/null +++ b/announcementAddForm.html @@ -0,0 +1,82 @@ + + + + + + + + Add Announcement + + +

Add Announcement

+

Please enter the required information here.

+
+

Title

+ +
+
+

Main Text

+ +
+
+ + + + +
+ + \ No newline at end of file diff --git a/announcements.html b/announcements.html index 9b755ab..1232967 100644 --- a/announcements.html +++ b/announcements.html @@ -8,9 +8,11 @@

Announcements

- + + + diff --git a/announcmentAddForm.html b/announcmentAddForm.html deleted file mode 100644 index 26d5606..0000000 --- a/announcmentAddForm.html +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/eventAddForm.html b/eventAddForm.html index e69de29..f320e11 100644 --- a/eventAddForm.html +++ b/eventAddForm.html @@ -0,0 +1,82 @@ + + + + + + + + Add Events + + +

Add Events

+

Please enter the required information here.

+
+

Title

+ +
+
+

Main Text

+ +
+
+ + + + +
+ + \ No newline at end of file diff --git a/events.html b/events.html index e94cbc6..ae07ef4 100644 --- a/events.html +++ b/events.html @@ -9,9 +9,11 @@

Events

- + + + diff --git a/officers.html b/officers.html index 1b8f2d6..c7e2030 100644 --- a/officers.html +++ b/officers.html @@ -10,9 +10,11 @@

Officers

- + + +