Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make "Tinkering Resources" footer link editable and attach to frontend #391

Merged
merged 18 commits into from
Apr 13, 2022
Merged

Make "Tinkering Resources" footer link editable and attach to frontend #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0c53441
Updated frontend development setup
khabdrick Apr 6, 2022
09162c1
Update README.md
khabdrick Apr 6, 2022
d6da248
Update README.md
khabdrick Apr 7, 2022
1bf1a8f
added tinkering resources to backend
khabdrick Apr 8, 2022
0a97f9c
added thinkering resources to frontend
khabdrick Apr 8, 2022
5424b5c
installed npm packages
khabdrick Apr 8, 2022
7b64432
Revert "installed npm packages"
khabdrick Apr 8, 2022
cc29a87
Merge branch 'unstructuredstudio:master' into new_thinker
khabdrick Apr 8, 2022
36ca1a4
Add hot reloading to media container (#382)
ajain1921 Apr 7, 2022
331bedf
Add new search features (#362)
AndrewLester Apr 7, 2022
d2fc11e
Revert package-lock (#383)
AndrewLester Apr 7, 2022
3b205b8
improveConsistency: fixed title text small, extra vertical space ... …
Jumeb Apr 7, 2022
a0e87ca
fix text overflow issue in signup page phone number field (#378)
qxprakash Apr 7, 2022
4b72d15
Updated frontend development setup section in readme (#380)
khabdrick Apr 7, 2022
a05646d
Use same border radius for next and prev buttons (#379)
Deepanshu039 Apr 7, 2022
01b87c7
Merge branch 'new_thinker' of github.com:khabdrick/zubhub into new_th…
khabdrick Apr 8, 2022
b206768
remove console.log()
khabdrick Apr 8, 2022
f037dca
Update PageWrapper.jsx
khabdrick Apr 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion zubhub_backend/zubhub/zubhub/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def save_model(self, request, obj, form, change):


class HeroAdmin(admin.ModelAdmin):
list_display = ["title", "image", "activity_url", "explore_ideas_url"]
list_display = ["title", "image", "activity_url", "explore_ideas_url", "tinkering_resource_url"]
search_fields = ["title", 'description']
exclude = ["id"]

Expand Down
18 changes: 18 additions & 0 deletions zubhub_backend/zubhub/zubhub/migrations/0006_hero_tinkering_resource_url.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.2 on 2022-04-05 03:42

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('zubhub', '0005_data_sanitization'),
]

operations = [
migrations.AddField(
model_name='hero',
name='tinkering_resource_url',
field=models.URLField(blank=True, max_length=1000, null=True),
),
]
1 change: 1 addition & 0 deletions zubhub_backend/zubhub/zubhub/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ class Hero(models.Model):
validators=[FileExtensionValidator(["","jpg", "jpeg", "jfif", "pjpeg", "pjp", "png", "svg", "webp"])])
activity_url = models.URLField(max_length=1000, blank=True, null=True)
explore_ideas_url = models.URLField(max_length=1000, blank=True, null=True)
tinkering_resource_url = models.URLField(max_length=1000, blank=True, null=True)

class Meta:
verbose_name = "Hero"
Expand Down
3 changes: 2 additions & 1 deletion zubhub_backend/zubhub/zubhub/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ class Meta:
"description",
"image_url",
"activity_url",
"explore_ideas_url"
"explore_ideas_url",
"tinkering_resource_url",
]

def get_image_url(self, instance):
Expand Down
9 changes: 7 additions & 2 deletions zubhub_frontend/zubhub/src/views/PageWrapper.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ function PageWrapper(props) {

const { anchor_el, loading, open_search_form } = state;
const { t } = props;
const { zubhub } = props.projects;
const { zubhub, hero } = props.projects;

const profileMenuOpen = Boolean(anchor_el);
return (
<>
Expand Down Expand Up @@ -675,7 +676,11 @@ function PageWrapper(props) {
<a
target="__blank"
rel="noreferrer"
href="http://kriti.unstructured.studio/"
href={
hero.tinkering_resource_url
? hero.tinkering_resource_url
:'https://kriti.unstructured.studio/'
}
className={common_classes.textDecorationNone}
>
<Typography
Expand Down
4 changes: 3 additions & 1 deletion zubhub_frontend/zubhub/src/views/projects/Projects.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@ function Projects(props) {
href={
hero.explore_ideas_url
? hero.explore_ideas_url
: 'https://kriti.unstructured.studio/'
: hero.tinkering_resource_url
? hero.tinkering_resource_url
:'https://kriti.unstructured.studio/'
}
target="__blank"
rel="noreferrer"
Expand Down