Merge pull request #74 from cmu-delphi/OKRS24-52-Redesign-Signal-Card

BrainIsDead · web-flow · commit 5b8997e134e6 · 2024-02-19T14:25:19.000+02:00
Okrs24 52 redesign signal card
diff --git a/src/assets/css/custom.css b/src/assets/css/custom.css
@@ -30,51 +30,60 @@
     }
 }
 
+.hover-shadow:hover {
+    box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);
+}
+.clickable-card {
+    cursor: pointer;
+}
 
-/* #navbarNav {
+#navbarNav {
     padding-left: 5%;
 }
 
-.navbar-logo {
-    padding-left: 5%;
+.margin-bottom-1rem {
+    margin-bottom: 1rem;
 }
 
-#main {
+.margin-top-1rem {
     margin-top: 1rem;
 }
 
-.no-padding {
-    padding: 0;
+.margin-bottom-0 {
+    margin-bottom: 0;
 }
 
 .no-margin {
     margin: 0;
 }
 
-.margin-bottom {
-    margin-bottom: 1rem;
+.text-left-center {
+    display: block;
+    margin: auto 0;
+    text-align: left !important;
 }
 
-.signals-list {
-    margin-right: 0.5rem;
+.no-padding {
+    padding: 0;
 }
-*/
 
+.border-left {
+    border-left: 1px solid #e4e4e4;
+}
 
-.clickable-table-row {
-    cursor: pointer;
+.full-text {
+    display: none;
 }
 
-#navbarNav {
-    padding-left: 5%;
+.hidden {
+    display: none;
 }
 
-.margin-bottom {
-    margin-bottom: 1rem;
+.related-link-card {
+    margin-right: 1rem;
+    margin-left: 1rem;
 }
 
-.text-left-center {
-    display: block;
-    margin: auto 0;
-    text-align: left !important;
+.padding-top-1rem {
+    padding-top: 1rem;
 }
diff --git a/src/base/models.py b/src/base/models.py
@@ -18,6 +18,7 @@ class LinkTypeChoices(models.TextChoices):
     WAVE_10_REVISION = 'wave_10_revision', _('Wave 10 revision updates')
     WAVE_11_REVISION = 'wave_11_revision', _('Wave 11 revision updates')
     OTHER = 'other', _('Other')
+    EXAMPLE_URL = 'example_url', _('Example URL')
 
 
 class Link(TimeStampedModel):
diff --git a/src/signals/models.py b/src/signals/models.py
@@ -241,6 +241,11 @@ class Signal(TimeStampedModel):
         on_delete=models.PROTECT,
     )
 
+    @property
+    def example_url(self):
+        example_url = self.links.filter(link_type="example_url").first()
+        return example_url.url if example_url else None
+
     class Meta:
         unique_together = ['name', 'source']
         ordering: list[str] = ["modified"]
diff --git a/src/templates/index.html b/src/templates/index.html
@@ -31,7 +31,8 @@
     <link href="{% static 'css/style.css' %}" rel="stylesheet" />
     <link href="{% static 'css/custom.css' %}" rel="stylesheet" />
 
-    <script src="{% static "js/htmx.min.js" %}"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
+    <script src="{% static 'js/htmx.min.js' %}"></script>
   </head>
 
   <body>
diff --git a/src/templates/signals/signal_detail.html b/src/templates/signals/signal_detail.html
diff --git a/src/templates/signals/signals.html b/src/templates/signals/signals.html

Original file line number	Diff line number	Diff line change
`@@ -30,51 +30,60 @@`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
	`33`	`+.hover-shadow:hover {`
	`34`	`+ box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);`
	`35`	`+}`
	`36`	`+.clickable-card {`
	`37`	`+ cursor: pointer;`
	`38`	`+}`
`33`	`39`
`34`		`-/* #navbarNav {`
	`40`	`+#navbarNav {`
`35`	`41`	`padding-left: 5%;`
`36`	`42`	`}`
`37`	`43`
`38`		`-.navbar-logo {`
`39`		`- padding-left: 5%;`
	`44`	`+.margin-bottom-1rem {`
	`45`	`+ margin-bottom: 1rem;`
`40`	`46`	`}`
`41`	`47`
`42`		`-#main {`
	`48`	`+.margin-top-1rem {`
`43`	`49`	`margin-top: 1rem;`
`44`	`50`	`}`
`45`	`51`
`46`		`-.no-padding {`
`47`		`- padding: 0;`
	`52`	`+.margin-bottom-0 {`
	`53`	`+ margin-bottom: 0;`
`48`	`54`	`}`
`49`	`55`
`50`	`56`	`.no-margin {`
`51`	`57`	`margin: 0;`
`52`	`58`	`}`
`53`	`59`
`54`		`-.margin-bottom {`
`55`		`- margin-bottom: 1rem;`
	`60`	`+.text-left-center {`
	`61`	`+ display: block;`
	`62`	`+ margin: auto 0;`
	`63`	`+ text-align: left !important;`
`56`	`64`	`}`
`57`	`65`
`58`		`-.signals-list {`
`59`		`- margin-right: 0.5rem;`
	`66`	`+.no-padding {`
	`67`	`+ padding: 0;`
`60`	`68`	`}`
`61`		`-*/`
`62`	`69`
	`70`	`+.border-left {`
	`71`	`+ border-left: 1px solid #e4e4e4;`
	`72`	`+}`
`63`	`73`
`64`		`-.clickable-table-row {`
`65`		`- cursor: pointer;`
	`74`	`+.full-text {`
	`75`	`+ display: none;`
`66`	`76`	`}`
`67`	`77`
`68`		`-#navbarNav {`
`69`		`- padding-left: 5%;`
	`78`	`+.hidden {`
	`79`	`+ display: none;`
`70`	`80`	`}`
`71`	`81`
`72`		`-.margin-bottom {`
`73`		`- margin-bottom: 1rem;`
	`82`	`+.related-link-card {`
	`83`	`+ margin-right: 1rem;`
	`84`	`+ margin-left: 1rem;`
`74`	`85`	`}`
`75`	`86`
`76`		`-.text-left-center {`
`77`		`- display: block;`
`78`		`- margin: auto 0;`
`79`		`- text-align: left !important;`
	`87`	`+.padding-top-1rem {`
	`88`	`+ padding-top: 1rem;`
`80`	`89`	`}`