Skip to content

Commit

Permalink
Redesign apps.fp.o
Browse files Browse the repository at this point in the history
Update yaml2json.py

Add favicon

Make jquery local

Style changes

Update build scripts and packaging

Also update data.json

fix capitalization in data.yaml

add missing images

Fix packages link

don't break fedmenu

build script update

build script instructions

Mobile support, center icons, fix scripts

Section description hidden in popover
  • Loading branch information
mymindstorm committed Feb 10, 2020
1 parent 30c7178 commit 9791fe8
Show file tree
Hide file tree
Showing 39 changed files with 161 additions and 26,844 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
js/jquery.min.js linguist-vendored
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
*.swp
*.pyc
build
dist
dist
32 changes: 5 additions & 27 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,10 @@ apps.fp.o

A dynamic landing page for http://apps.fedoraproject.org

Idea
----

Right now, the apps side of Fedora Infrastructure feels scattered and all over
the place. It seems like I learn that a new thing exists every couple weeks and
it seems like there's not a single easy place where you can stumble into
everything.

That's what this page is for. I'm kind of barging ahead with it without
consulting anyone else yet but I fully intend to take in criticism (and patches,
really!) to make it more awesome and reflective of the community's desires.

You can see a demo version up at https://apps.stg.fedoraproject.org/ right
now.

IPv6-only
---------

Sometimes you may have services that are only available over IPv6.
In such situations, you can mark those as ipv6_only: true in the yaml
and making your webserver serve a different version of ``js/config.js`` for IPv6
and IPv4.

One way to do this is by redirecting the requests to this file to another vhost,
and have that vhost serve a different root directory for IPv4 vs IPv6.
Build
-----

Run ``build.sh``. Requires PyYAML to be installed.

Help?
-----
Expand All @@ -43,8 +21,8 @@ If you want to use this for another community site, feel free.
Fork, tweak, and run the following to regenerate some of the static
pieces from ``data/apps.yaml``::

python bin/yaml2html.py > apps-yaml.html
python bin/yaml2json.py > js/data.js
python yaml2json.py > data/data.json
python yaml2js.py > js/data.js

Contact
-------
Expand Down
28 changes: 11 additions & 17 deletions apps-fp-o.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%global prefix /srv/web

Name: apps-fp-o
Version: 2.0
Version: 3.0
Release: 1%{?dist}
Summary: A landing page for apps.fedoraproject.org

Expand All @@ -14,10 +14,11 @@ Source0: %{name}-%{version}.tar.gz
BuildArch: noarch

# Needed for getting httpd's gid
BuildRequires: python
BuildRequires: httpd

# Used for the yaml2{json,html}.py scripts.
Requires: PyYAML
BuildRequires: PyYAML

%description
This is static HTML, CSS, and javascript for a landing page for
Expand All @@ -31,32 +32,25 @@ diagram.
%setup -q

%build
# Nada
python ./yaml2json.py > ./data/data.json
python ./yaml2js.py > ./js/data.js

%install
mkdir -p %{buildroot}/%{_bindir}
install -m 0755 bin/yaml2html.py %{buildroot}/%{_bindir}/%{name}-yaml2html.py
install -m 0755 bin/yaml2json.py %{buildroot}/%{_bindir}/%{name}-yaml2json.py

mkdir -p %{buildroot}/%{_datadir}/%{name}
install -m 0644 data/* %{buildroot}/%{_datadir}/%{name}

mkdir -p %{buildroot}/%{prefix}/%{name}
cp -r {index.html,apps-yaml.html,bootstrap,bootstrap-3.1.1-fedora,css,img,js} %{buildroot}/%{prefix}/%{name}/.
cp -r {index.html,favicon.ico,css,img,js,data} %{buildroot}/%{prefix}/%{name}/.

%files
%doc README.rst LICENSE CONTRIBUTING.rst

%{_bindir}/%{name}-yaml2json.py
%{_bindir}/%{name}-yaml2html.py

%{_datadir}/%{name}/apps.yaml
%doc README.rst CONTRIBUTING.rst
%license LICENSE

# The rest of the content goes here
%{prefix}/%{name}/
%attr(755, httpd, httpd) %dir %{prefix}/%{name}/

%changelog
* Tue Oct 09 2018 Brendan Early <[email protected]> - 3.0-1
- Redesign

* Thu Apr 23 2015 Ralph Bean <[email protected]> - 2.0-1
- Add packager and user template strings for make glorious fedmenu future.

Expand Down
Loading

0 comments on commit 9791fe8

Please sign in to comment.