Fixed merging errors

Casvt · Mar 11, 2024 · 91b485c · 91b485c
1 parent d93c19b
commit 91b485c
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 844 deletions.
diff --git a/frontend/static/css/info.css b/frontend/static/css/info.css
@@ -117,10 +117,7 @@
 .form-container > form .repeat-options > button {
 	width: calc((100% / 3) - (var(--gap) / 1.5));
 	min-width: min-content;
-<<<<<<< HEAD
-=======
 	padding: 1rem 0rem;
->>>>>>> Development
 }
 
 .repeat-bar {
@@ -227,10 +224,7 @@ div.options > button {
 	.sub-inputs > input,
 	.sub-inputs > select,
 	.sub-inputs > button,
-<<<<<<< HEAD
-=======
 	.sub-inputs > label,
->>>>>>> Development
 	.form-container > form .repeat-options > button {
 		width: 100%;
 	}

diff --git a/frontend/static/css/notification.css b/frontend/static/css/notification.css
@@ -249,173 +249,24 @@ tr:has(input:read-only) button[data-type="save"] {
 	display: none;
 }
 
-<<<<<<< HEAD
-/*  */
-/* Add service */
-/*  */
-#add-service-container {
-	display: none;
-}
-
-.overflow-container.show-add #add-service-container {
-	display: block;
-}
-
-.overflow-container.show-add > table {
-	display: none;
-}
-
-#service-list {
-	display: flex;
-	gap: 1rem;
-	flex-wrap: wrap;
-	justify-content: center;
-}
-
-#service-list button {
-	width: max(30%, 10rem);
-	height: 6rem;
-
-	display: flex;
-	justify-content: center;
-	align-items: center;
-
-	padding: .75rem;
-	border-radius: 4px;
-	border: 2px solid var(--color-gray);
-
-	text-align: center;
-	font-size: 1.1rem;
-}
-
-#add-service-container.show-add-window #add-service-window {
-	display: flex;
-}
-
-#add-service-container.show-add-window #service-list {
-	display: none;
-}
-
-/*  */
-/* Add service form */
-/*  */
-#add-service-window {
-	max-width: 30rem;
-	margin: auto;
-
-	display: none;
-	flex-direction: column;
-	justify-content: center;
-	gap: 1rem;
-
-	text-align: center;
-}
-
-#add-service-window > h3 {
-	font-size: 1.75rem;
-}
-
-#add-service-window > p {
-	margin-bottom: calc((1rem + 2px) * -1);
-
-	border: 2px solid var(--color-gray);
-	border-top-left-radius: 4px;
-	border-top-right-radius: 4px;
-	padding: .75rem 1rem;
-	color: var(--color-gray);
-
-	text-align: left;
-
-	box-shadow: var(--default-shadow);
-}
-
-#add-service-window > button {
-	border-radius: 4px;
-	border: 2px solid var(--color-gray);
-	padding: .75rem;
-}
-
-#add-service-window > a,
-#add-service-window > p > a {
-	color: var(--color-light);
-}
-
-#add-service-window > div[data-map],
-#add-service-window > div[data-map] > .entries-list {
-	display: flex;
-	flex-direction: column;
-	gap: inherit;
-}
-
-#add-service-window > div[data-map] {
-	padding: .5rem;
-	border: 2px solid var(--color-gray);
-	border-radius: 4px;
-	box-shadow: var(--default-shadow);
-}
-
-#add-service-window > div[data-map] > p {
-	color: var(--color-gray);
-	font-size: 1.1rem;
-}
-
-.entries-list {
-	min-height: 5rem;
-	max-height: 15rem;
-	overflow-y: auto;
-
-	align-items: center;
-
-	background-color: var(--color-dark);
-	color: var(--color-light);
-	border: 2px solid var(--color-gray);
-	border-radius: 4px;
-	padding: .75rem;
-	box-shadow: var(--default-shadow);
-
-	font-size: 1rem;
-}
-
-.entries-list > p:first-child {
-	color: var(--color-gray);
-	font-size: 1.1rem;
-}
-
-.input-entries:not(:has(div)) {
-	display: none;
-}
-
-.add-row {
-	height: 2rem;
-	width: 80%;
-
-	display: flex;
-=======
 .add-row {
 	width: min(100%, 21rem);
 
 	display: flex;
 	justify-content: center;
 	flex-wrap: wrap;
->>>>>>> Development
 	gap: 1rem;
 }
 
 .add-row input {
 	flex-grow: 1;
-<<<<<<< HEAD
-=======
 	height: 2rem;
 	min-width: 0rem;
->>>>>>> Development
 	font-size: .8rem;
 }
 
 .add-row button {
-<<<<<<< HEAD
-=======
 	height: 2rem;
->>>>>>> Development
 	padding: .35rem .75rem;
 	background-color: var(--color-gray);
 	border-radius: 4px;
@@ -440,12 +291,9 @@ tr:has(input:read-only) button[data-type="save"] {
 	height: inherit;
 	fill: var(--color-dark);
 }
-<<<<<<< HEAD
-=======
 
 @media (max-width: 543px) {
 	#service-list button {
 		flex-grow: 1;
 	}
 }
->>>>>>> Development
diff --git a/frontend/static/js/general.js b/frontend/static/js/general.js
@@ -62,14 +62,10 @@ function logout() {
 const default_values = {
 	'api_key': null,
 	'locale': 'en-GB',
-<<<<<<< HEAD
-	'default_service': null
-=======
 	'default_service': null,
 	'sorting_reminders': 'time',
 	'sorting_static': 'title',
 	'sorting_templates': 'title'
->>>>>>> Development
 };
 
 function setupLocalStorage() {
@@ -125,4 +121,4 @@ const url_prefix = document.getElementById('url_prefix').dataset.value;
 const api_key = getLocalStorage('api_key')['api_key'];
 if (api_key === null) {
 	window.location.href = `${url_prefix}/`;
-};
+};
diff --git a/frontend/static/js/library.js b/frontend/static/js/library.js
@@ -57,19 +57,6 @@ function getActiveTab() {
 // 
 // Filling library
 // 
-function getWeekDays(locale)
-{
-	let baseDate = new Date(Date.UTC(2017, 0, 2)); // just a Monday
-	let weekDays = [];
-	for(i = 0; i < 7; i++)
-	{
-		weekDays.push(baseDate.toLocaleDateString(locale, { weekday: 'short' }));
-		baseDate.setDate(baseDate.getDate() + 1);
-	}
-	return weekDays;
-};
-const week_days = getWeekDays(getLocalStorage('locale')['locale']);
-
 function fillTable(table, results) {
 	table.querySelectorAll('button.entry:not(.add-entry)').forEach(
 		e => e.remove()
@@ -103,11 +90,7 @@ function fillTable(table, results) {
 				formatted_date += interval_text;
 
 			} else if (r.weekdays !== null)
-<<<<<<< HEAD
-				formatted_date += ` (each ${r.weekdays.split(',').map(d => week_days[parseInt(d)]).join(', ')})`;
-=======
 				formatted_date += ` (each ${r.weekdays.map(d => week_days[d]).join(', ')})`;
->>>>>>> Development
 
 			time.innerText = formatted_date;
 			entry.appendChild(time);
@@ -198,4 +181,4 @@ LibEls.tab_selector.querySelectorAll('input').forEach(r => r.onchange = e => {
 	evaluateSizing();
 	LibEls.search_bar.input.value = '';
 	LibEls.search_bar.sort.value = getSorting(getActiveTab());
-});
+});