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.

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

URL Cleanup #26

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 customers-stores-ui/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Customer Stores User Interface

## Prerequisites

- Make sure you have [Spring Boot for Groovy installed] (http://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference/htmlsingle/#getting-started-gvm-cli-installation)
- Make sure you have [Spring Boot for Groovy installed] (https://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference/htmlsingle/#getting-started-gvm-cli-installation)
- Make sure [Spring Cloud CLI is installed] (https://github.com/spring-cloud/spring-cloud-cli)

## How to Run
Expand Down
44 changes: 22 additions & 22 deletions customers-stores-ui/app/.htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# (!) Using `.htaccess` files slows down Apache, therefore, if you have access
# to the main server config file (usually called `httpd.conf`), you should add
# this logic there: http://httpd.apache.org/docs/current/howto/htaccess.html.
# this logic there: https://httpd.apache.org/docs/current/howto/htaccess.html.

# ##############################################################################
# # CROSS-ORIGIN RESOURCE SHARING (CORS) #
Expand All @@ -13,8 +13,8 @@
# ------------------------------------------------------------------------------

# Enable cross-origin AJAX requests.
# http://code.google.com/p/html5security/wiki/CrossOriginRequestSecurity
# http://enable-cors.org/
# https://code.google.com/p/html5security/wiki/CrossOriginRequestSecurity
# https://enable-cors.org/

# <IfModule mod_headers.c>
# Header set Access-Control-Allow-Origin "*"
Expand All @@ -26,8 +26,8 @@

# Send the CORS header for images when browsers request it.
# https://developer.mozilla.org/en/CORS_Enabled_Image
# http://blog.chromium.org/2011/07/using-cross-domain-images-in-webgl-and.html
# http://hacks.mozilla.org/2011/11/using-cors-to-load-webgl-textures-from-cross-domain-images/
# https://blog.chromium.org/2011/07/using-cross-domain-images-in-webgl-and.html
# https://hacks.mozilla.org/2011/11/using-cors-to-load-webgl-textures-from-cross-domain-images/

<IfModule mod_setenvif.c>
<IfModule mod_headers.c>
Expand Down Expand Up @@ -61,8 +61,8 @@

# Prevent Apache from returning a 404 error for a rewrite if a directory
# with the same name does not exist.
# http://httpd.apache.org/docs/current/content-negotiation.html#multiviews
# http://www.webmasterworld.com/apache/3808792.htm
# https://httpd.apache.org/docs/current/content-negotiation.html#multiviews
# https://www.webmasterworld.com/apache/3808792.htm

Options -MultiViews

Expand All @@ -71,7 +71,7 @@ Options -MultiViews
# ------------------------------------------------------------------------------

# You can customize what Apache returns to the client in case of an error (see
# http://httpd.apache.org/docs/current/mod/core.html#errordocument), e.g.:
# https://httpd.apache.org/docs/current/mod/core.html#errordocument), e.g.:

ErrorDocument 404 /404.html

Expand All @@ -85,7 +85,7 @@ ErrorDocument 404 /404.html
# ------------------------------------------------------------------------------

# Force IE to render pages in the highest available mode in the various
# cases when it may not: http://hsivonen.iki.fi/doctype/ie-mode.pdf.
# cases when it may not: https://hsivonen.iki.fi/doctype/ie-mode.pdf.

<IfModule mod_headers.c>
Header set X-UA-Compatible "IE=edge"
Expand Down Expand Up @@ -135,7 +135,7 @@ ErrorDocument 404 /404.html

# JavaScript
# Normalize to standard type (it's sniffed in IE anyways):
# http://tools.ietf.org/html/rfc4329#section-7.2
# https://tools.ietf.org/html/rfc4329#section-7.2
AddType application/javascript js jsonp
AddType application/json json

Expand Down Expand Up @@ -203,10 +203,10 @@ AddDefaultCharset utf-8

# If your web host doesn't allow the `FollowSymlinks` option, you may need to
# comment it out and use `Options +SymLinksIfOwnerMatch` but, be aware of the
# performance impact: http://httpd.apache.org/docs/current/misc/perf-tuning.html#symlinks
# performance impact: https://httpd.apache.org/docs/current/misc/perf-tuning.html#symlinks

# Also, some cloud hosting services require `RewriteBase` to be set:
# http://www.rackspace.com/knowledge_center/frequently-asked-question/why-is-mod-rewrite-not-working-on-my-site
# https://www.rackspace.com/knowledge_center/frequently-asked-question/why-is-mod-rewrite-not-working-on-my-site

<IfModule mod_rewrite.c>
Options +FollowSymlinks
Expand Down Expand Up @@ -239,7 +239,7 @@ AddDefaultCharset utf-8
<IfModule mod_rewrite.c>
RewriteCond %{HTTPS} !=on
RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]
RewriteRule ^ http://%1%{REQUEST_URI} [R=301,L]
RewriteRule ^ https://%1%{REQUEST_URI} [R=301,L]
</IfModule>

# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand All @@ -252,7 +252,7 @@ AddDefaultCharset utf-8
# <IfModule mod_rewrite.c>
# RewriteCond %{HTTPS} !=on
# RewriteCond %{HTTP_HOST} !^www\..+$ [NC]
# RewriteRule ^ http://www.%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
# RewriteRule ^ https://www.%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
# </IfModule>


Expand All @@ -273,8 +273,8 @@ AddDefaultCharset utf-8
# work as-is for your site!

# To get all the details you'll need to craft a reasonable policy for your site,
# read: http://html5rocks.com/en/tutorials/security/content-security-policy (or
# see the specification: http://w3.org/TR/CSP).
# read: https://www.html5rocks.com/en/tutorials/security/content-security-policy (or
# see the specification: https://w3.org/TR/CSP).

# <IfModule mod_headers.c>
# Header set Content-Security-Policy "script-src 'self'; object-src 'self'"
Expand Down Expand Up @@ -341,7 +341,7 @@ AddDefaultCharset utf-8
# (the initial HTTP connection) for an attacker to downgrade or redirect the
# request. The following header ensures that browser will ONLY connect to your
# server via HTTPS, regardless of what the users type in the address bar.
# http://www.html5rocks.com/en/tutorials/security/transport-layer-security/
# https://www.html5rocks.com/en/tutorials/security/transport-layer-security/

# <IfModule mod_headers.c>
# Header set Strict-Transport-Security max-age=16070400;
Expand Down Expand Up @@ -370,7 +370,7 @@ AddDefaultCharset utf-8
<IfModule mod_deflate.c>

# Force compression for mangled headers.
# http://developer.yahoo.com/blogs/ydn/posts/2010/12/pushing-beyond-gzipping
# https://developer.yahoo.com/blogs/ydn/posts/2010/12/pushing-beyond-gzipping
<IfModule mod_setenvif.c>
<IfModule mod_headers.c>
SetEnvIfNoCase ^(Accept-EncodXng|X-cept-Encoding|X{15}|~{15}|-{15})$ ^((gzip|deflate)\s*,?\s*)+|[X~-]{4,13}$ HAVE_Accept-Encoding
Expand Down Expand Up @@ -409,7 +409,7 @@ AddDefaultCharset utf-8
# ------------------------------------------------------------------------------

# Prevent some of the mobile network providers from modifying the content of
# your site: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9.5.
# your site: https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9.5.

# <IfModule mod_headers.c>
# Header set Cache-Control "no-transform"
Expand All @@ -420,7 +420,7 @@ AddDefaultCharset utf-8
# ------------------------------------------------------------------------------

# Since we're sending far-future expires headers (see below), ETags can
# be removed: http://developer.yahoo.com/performance/rules.html#etags.
# be removed: https://developer.yahoo.com/performance/rules.html#etags.

# `FileETag None` is not enough for every server.
<IfModule mod_headers.c>
Expand Down Expand Up @@ -497,7 +497,7 @@ FileETag None
# requests such as `/css/style.12345.css` to `/css/style.css`.

# To understand why this is important and a better idea than `*.css?v231`, read:
# http://stevesouders.com/blog/2008/08/23/revving-filenames-dont-use-querystring
# https://stevesouders.com/blog/2008/08/23/revving-filenames-dont-use-querystring

# <IfModule mod_rewrite.c>
# RewriteCond %{REQUEST_FILENAME} !-f
Expand Down Expand Up @@ -533,7 +533,7 @@ FileETag None
# ------------------------------------------------------------------------------

# Allow multiple requests to be sent over the same TCP connection:
# http://httpd.apache.org/docs/current/en/mod/core.html#keepalive.
# https://httpd.apache.org/docs/current/en/mod/core.html#keepalive.

# Enable if you serve a lot of static content but, be aware of the
# possible disadvantages!
Expand Down
2 changes: 1 addition & 1 deletion customers-stores-ui/app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</head>
<body ng-app="customersStoresUiApp">
<!--[if lt IE 7]>
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="https://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]-->
<div ng-cloak class="splash" >
<div class="container">Loading...</div>
Expand Down
2 changes: 1 addition & 1 deletion customers-stores-ui/app/scripts/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ angular
'google-maps'
])
.constant('appConfiguration', {
//e.g. http://myserver:9000/rest
//e.g. https://myserver:9000/rest
customerApiUrl: window.location.protocol + '//' + window.location.host,
storeApiUrl: window.location.protocol + '//' + window.location.host
})
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
eureka.client.serviceUrl.defaultZone: http://user:[email protected]/eureka/
eureka.client.serviceUrl.defaultZone: https://user:[email protected]/eureka/
44 changes: 22 additions & 22 deletions customers-stores-ui/src/main/resources/static/.htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# (!) Using `.htaccess` files slows down Apache, therefore, if you have access
# to the main server config file (usually called `httpd.conf`), you should add
# this logic there: http://httpd.apache.org/docs/current/howto/htaccess.html.
# this logic there: https://httpd.apache.org/docs/current/howto/htaccess.html.

# ##############################################################################
# # CROSS-ORIGIN RESOURCE SHARING (CORS) #
Expand All @@ -13,8 +13,8 @@
# ------------------------------------------------------------------------------

# Enable cross-origin AJAX requests.
# http://code.google.com/p/html5security/wiki/CrossOriginRequestSecurity
# http://enable-cors.org/
# https://code.google.com/p/html5security/wiki/CrossOriginRequestSecurity
# https://enable-cors.org/

# <IfModule mod_headers.c>
# Header set Access-Control-Allow-Origin "*"
Expand All @@ -26,8 +26,8 @@

# Send the CORS header for images when browsers request it.
# https://developer.mozilla.org/en/CORS_Enabled_Image
# http://blog.chromium.org/2011/07/using-cross-domain-images-in-webgl-and.html
# http://hacks.mozilla.org/2011/11/using-cors-to-load-webgl-textures-from-cross-domain-images/
# https://blog.chromium.org/2011/07/using-cross-domain-images-in-webgl-and.html
# https://hacks.mozilla.org/2011/11/using-cors-to-load-webgl-textures-from-cross-domain-images/

<IfModule mod_setenvif.c>
<IfModule mod_headers.c>
Expand Down Expand Up @@ -61,8 +61,8 @@

# Prevent Apache from returning a 404 error for a rewrite if a directory
# with the same name does not exist.
# http://httpd.apache.org/docs/current/content-negotiation.html#multiviews
# http://www.webmasterworld.com/apache/3808792.htm
# https://httpd.apache.org/docs/current/content-negotiation.html#multiviews
# https://www.webmasterworld.com/apache/3808792.htm

Options -MultiViews

Expand All @@ -71,7 +71,7 @@ Options -MultiViews
# ------------------------------------------------------------------------------

# You can customize what Apache returns to the client in case of an error (see
# http://httpd.apache.org/docs/current/mod/core.html#errordocument), e.g.:
# https://httpd.apache.org/docs/current/mod/core.html#errordocument), e.g.:

ErrorDocument 404 /404.html

Expand All @@ -85,7 +85,7 @@ ErrorDocument 404 /404.html
# ------------------------------------------------------------------------------

# Force IE to render pages in the highest available mode in the various
# cases when it may not: http://hsivonen.iki.fi/doctype/ie-mode.pdf.
# cases when it may not: https://hsivonen.iki.fi/doctype/ie-mode.pdf.

<IfModule mod_headers.c>
Header set X-UA-Compatible "IE=edge"
Expand Down Expand Up @@ -135,7 +135,7 @@ ErrorDocument 404 /404.html

# JavaScript
# Normalize to standard type (it's sniffed in IE anyways):
# http://tools.ietf.org/html/rfc4329#section-7.2
# https://tools.ietf.org/html/rfc4329#section-7.2
AddType application/javascript js jsonp
AddType application/json json

Expand Down Expand Up @@ -203,10 +203,10 @@ AddDefaultCharset utf-8

# If your web host doesn't allow the `FollowSymlinks` option, you may need to
# comment it out and use `Options +SymLinksIfOwnerMatch` but, be aware of the
# performance impact: http://httpd.apache.org/docs/current/misc/perf-tuning.html#symlinks
# performance impact: https://httpd.apache.org/docs/current/misc/perf-tuning.html#symlinks

# Also, some cloud hosting services require `RewriteBase` to be set:
# http://www.rackspace.com/knowledge_center/frequently-asked-question/why-is-mod-rewrite-not-working-on-my-site
# https://www.rackspace.com/knowledge_center/frequently-asked-question/why-is-mod-rewrite-not-working-on-my-site

<IfModule mod_rewrite.c>
Options +FollowSymlinks
Expand Down Expand Up @@ -239,7 +239,7 @@ AddDefaultCharset utf-8
<IfModule mod_rewrite.c>
RewriteCond %{HTTPS} !=on
RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]
RewriteRule ^ http://%1%{REQUEST_URI} [R=301,L]
RewriteRule ^ https://%1%{REQUEST_URI} [R=301,L]
</IfModule>

# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand All @@ -252,7 +252,7 @@ AddDefaultCharset utf-8
# <IfModule mod_rewrite.c>
# RewriteCond %{HTTPS} !=on
# RewriteCond %{HTTP_HOST} !^www\..+$ [NC]
# RewriteRule ^ http://www.%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
# RewriteRule ^ https://www.%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
# </IfModule>


Expand All @@ -273,8 +273,8 @@ AddDefaultCharset utf-8
# work as-is for your site!

# To get all the details you'll need to craft a reasonable policy for your site,
# read: http://html5rocks.com/en/tutorials/security/content-security-policy (or
# see the specification: http://w3.org/TR/CSP).
# read: https://www.html5rocks.com/en/tutorials/security/content-security-policy (or
# see the specification: https://w3.org/TR/CSP).

# <IfModule mod_headers.c>
# Header set Content-Security-Policy "script-src 'self'; object-src 'self'"
Expand Down Expand Up @@ -341,7 +341,7 @@ AddDefaultCharset utf-8
# (the initial HTTP connection) for an attacker to downgrade or redirect the
# request. The following header ensures that browser will ONLY connect to your
# server via HTTPS, regardless of what the users type in the address bar.
# http://www.html5rocks.com/en/tutorials/security/transport-layer-security/
# https://www.html5rocks.com/en/tutorials/security/transport-layer-security/

# <IfModule mod_headers.c>
# Header set Strict-Transport-Security max-age=16070400;
Expand Down Expand Up @@ -370,7 +370,7 @@ AddDefaultCharset utf-8
<IfModule mod_deflate.c>

# Force compression for mangled headers.
# http://developer.yahoo.com/blogs/ydn/posts/2010/12/pushing-beyond-gzipping
# https://developer.yahoo.com/blogs/ydn/posts/2010/12/pushing-beyond-gzipping
<IfModule mod_setenvif.c>
<IfModule mod_headers.c>
SetEnvIfNoCase ^(Accept-EncodXng|X-cept-Encoding|X{15}|~{15}|-{15})$ ^((gzip|deflate)\s*,?\s*)+|[X~-]{4,13}$ HAVE_Accept-Encoding
Expand Down Expand Up @@ -409,7 +409,7 @@ AddDefaultCharset utf-8
# ------------------------------------------------------------------------------

# Prevent some of the mobile network providers from modifying the content of
# your site: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9.5.
# your site: https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9.5.

# <IfModule mod_headers.c>
# Header set Cache-Control "no-transform"
Expand All @@ -420,7 +420,7 @@ AddDefaultCharset utf-8
# ------------------------------------------------------------------------------

# Since we're sending far-future expires headers (see below), ETags can
# be removed: http://developer.yahoo.com/performance/rules.html#etags.
# be removed: https://developer.yahoo.com/performance/rules.html#etags.

# `FileETag None` is not enough for every server.
<IfModule mod_headers.c>
Expand Down Expand Up @@ -497,7 +497,7 @@ FileETag None
# requests such as `/css/style.12345.css` to `/css/style.css`.

# To understand why this is important and a better idea than `*.css?v231`, read:
# http://stevesouders.com/blog/2008/08/23/revving-filenames-dont-use-querystring
# https://stevesouders.com/blog/2008/08/23/revving-filenames-dont-use-querystring

# <IfModule mod_rewrite.c>
# RewriteCond %{REQUEST_FILENAME} !-f
Expand Down Expand Up @@ -533,7 +533,7 @@ FileETag None
# ------------------------------------------------------------------------------

# Allow multiple requests to be sent over the same TCP connection:
# http://httpd.apache.org/docs/current/en/mod/core.html#keepalive.
# https://httpd.apache.org/docs/current/en/mod/core.html#keepalive.

# Enable if you serve a lot of static content but, be aware of the
# possible disadvantages!
Expand Down
2 changes: 1 addition & 1 deletion customers-stores-ui/src/main/resources/static/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!doctype html> <html class="no-js"> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <meta name="viewport" content="width=device-width"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.20833e0b.css"> <link rel="stylesheet" href="styles/main.fc9417dd.css"> <body ng-app="customersStoresUiApp"> <!--[if lt IE 7]>
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="https://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]--> <div ng-cloak class="splash"> <div class="container">Loading...</div> </div> <nav class="navbar navbar-default" role="navigation" ng-cloak> <div class="container"> <div class="navbar-header"> <a class="navbar-brand" ui-sref="home.jobs.tabs.definitions"><span></span></a> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> </div> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <p ng-if="authenticationEnabled && user.isAuthenticated" class="navbar-text navbar-right">Signed in as <strong>{{user.username}}</strong> </p> <p ng-if="authenticationEnabled && !user.isAuthenticated" class="navbar-text navbar-right">Not logged in</p> <ul class="nav navbar-nav navbar-right"> <li ng-class="{ active: $state.includes('customers') }"> <a ui-sref="customers">Customers</a> </li> <li ng-class="{ active: $state.includes('stores') }"> <a ui-sref="stores">Stores</a> </li> <li ng-class="{ active: $state.includes('about') }"> <a ui-sref="about">About</a> </li> <li ng-if="authenticationEnabled" class="dropdown"><a data-target="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-user"></span><b class="caret"></b></a> <ul class="dropdown-menu"> <li ng-if="user.isAuthenticated"><a ui-sref="logout">Logout</a></li> <li ng-if="!user.isAuthenticated"><a ui-sref="login">Login</a></li> </ul> </li> </ul> </div> </div> </nav> <!-- Add your site or application content here --> <div class="container"> <div class="container-fluid"> <div class="container xd-container"> <div ui-view id="xd-content" class="tab-content"></div> </div> </div> <div class="footer"> <p><span class="glyphicon glyphicon-heart"></span> from the Spring team</p> </div> </div> <!-- Google Analytics: change UA-XXXXX-X to be your site's ID --> <script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion customers-stores-ui/test/karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Karma configuration
// http://karma-runner.github.io/0.12/config/configuration-file.html
// https://karma-runner.github.io/0.12/config/configuration-file.html
// Generated on 2014-07-29 using
// generator-karma 0.8.3

Expand Down
Loading